Fix the css style font test

Setting the font: shorthand to something like smaller is not
in line with the css spec. Just set the font-size: property
for this.

Also fix the other font: shorthand to specify size and family
according to the css spec.

diff --git a/testsuite/css/style/font.css b/testsuite/css/style/font.css
index 86b2ba08b1262155ac8480f7065f93d00155102d..9c9962366593b07667a936f07859e57b6349c09c 100644 (file)
--- a/testsuite/css/style/font.css
+++ b/testsuite/css/style/font.css
@@ -1,7 +1,7 @@
 box {
-  font: "Comic Sans 10";
+  font: 10px "Comic Sans";
 }
 
 label {
-  font: smaller;
+  font-size: smaller;
 }

diff --git a/testsuite/css/style/font.nodes b/testsuite/css/style/font.nodes
index 02044b4466530ecfa499dfae872fa26f67e16514..ef23f94007154ca2d87f0c8be378909186edab3e 100644 (file)
--- a/testsuite/css/style/font.nodes
+++ b/testsuite/css/style/font.nodes
@@ -1,12 +1,12 @@
 [window.background:dir(ltr)]
   decoration:dir(ltr)
   box.horizontal:dir(ltr)
-    font-size: 10px; /* font.css:2:23 */
-    font-family: "\"Comic Sans 10\""; /* font.css:2:23 */
-    font-style: normal; /* font.css:2:23 */
-    font-variant: normal; /* font.css:2:23 */
-    font-weight: normal; /* font.css:2:23 */
-    font-stretch: normal; /* font.css:2:23 */
+    font-size: 10px; /* font.css:2:25 */
+    font-family: "Comic Sans"; /* font.css:2:25 */
+    font-style: normal; /* font.css:2:25 */
+    font-variant: normal; /* font.css:2:25 */
+    font-weight: normal; /* font.css:2:25 */
+    font-stretch: normal; /* font.css:2:25 */
 
     label:dir(ltr)
       font-size: 8.3333333333333339px; /* font.css:6:20 */